gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32) Store the type

2005-11-09  Tor Lillqvist  <tml@novell.com>

	* gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32)
	* gdk/win32/gdkwindow-win32.c (gdk_window_impl_win32_init,
	gdk_window_get_type_hint, gdk_window_get_type_hint): Store the
	type hint. Implement gdk_window_get_type_hint() by just returning
	the hint stored.

diff --git a/ChangeLog b/ChangeLog
index 193ee8605113344074e56536d9ece84742c66102..91a5b42b79aa4d8fc2613ab5306a8d3f20630005 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-09  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32)
+       * gdk/win32/gdkwindow-win32.c (gdk_window_impl_win32_init,
+       gdk_window_get_type_hint, gdk_window_get_type_hint): Store the
+       type hint. Implement gdk_window_get_type_hint() by just returning
+       the hint stored.
+
 2005-11-09  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 193ee8605113344074e56536d9ece84742c66102..91a5b42b79aa4d8fc2613ab5306a8d3f20630005 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-11-09  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkwindow-win32.h (struct _GdkWindowImplWin32)
+       * gdk/win32/gdkwindow-win32.c (gdk_window_impl_win32_init,
+       gdk_window_get_type_hint, gdk_window_get_type_hint): Store the
+       type hint. Implement gdk_window_get_type_hint() by just returning
+       the hint stored.
+
 2005-11-09  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_geometry_hints):

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index e955fc795030975580fee0dce7b938d3b8f5e16f..5c867d3260693778fae20878646356398a36d3c8 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -132,6 +132,7 @@ gdk_window_impl_win32_init (GdkWindowImplWin32 *impl)
   impl->hicon_big = NULL;
   impl->hicon_small = NULL;
   impl->hint_flags = 0;
+  impl->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
   impl->extension_events_selected = FALSE;
 }
 
@@ -3144,6 +3145,9 @@ gdk_window_set_type_hint (GdkWindow        *window,
 
   GDK_NOTE (MISC, g_print ("gdk_window_set_type_hint: %p: %d\n",
                           GDK_WINDOW_HWND (window), hint));
+
+  GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->type_hint = hint;
+
   switch (hint)
     {
     case GDK_WINDOW_TYPE_HINT_DIALOG:
@@ -3180,6 +3184,17 @@ gdk_window_set_type_hint (GdkWindow        *window,
     }
 }
 
+GdkWindowTypeHint
+gdk_window_get_type_hint (GdkWindow *window)
+{
+  g_return_val_if_fail (GDK_IS_WINDOW (window), GDK_WINDOW_TYPE_HINT_NORMAL);
+  
+  if (GDK_WINDOW_DESTROYED (window))
+    return GDK_WINDOW_TYPE_HINT_NORMAL;
+
+  return GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl)->type_hint;
+}
+
 void
 gdk_window_shape_combine_region (GdkWindow *window,
                                  GdkRegion *shape_region,

diff --git a/gdk/win32/gdkwindow-win32.h b/gdk/win32/gdkwindow-win32.h
index 62debe513d0e9bf3ad99aefe2485ded88e047f5b..892110b5a104d0c330bc62e1ea4c4d8ef23a1184 100644 (file)
--- a/gdk/win32/gdkwindow-win32.h
+++ b/gdk/win32/gdkwindow-win32.h
@@ -83,6 +83,8 @@ struct _GdkWindowImplWin32
   gint hint_flags;
   GdkGeometry hints;
 
+  GdkWindowTypeHint type_hint;
+
   gboolean extension_events_selected;
 };